Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 12 May 2010 12:17:09 +0000 (12:17 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 12 May 2010 12:17:09 +0000 (12:17 +0000)

Trivial merge